Stuff
Added changes from 11/4/2014