2 hours -> 1

this probably should have been combined with the last commit... oops.