From Work 12/19/2014: minor changes related to fit