recommiting earlier changes. note to self: don't commit at 6 in the morning