Undid changes for 1.2.1, reverted to 1.2