recommiting some changes from last night