Able to restore from history
Bug corrections