Added small stuff plus big change to undo