Undo and redo work for sure