Leftover changes from 11/5/14