Undo some of the last minute bugfix? please work?