Made changes from 12/12/2014