Change Undo method
Add some filters