undo bugs, refractoring