Made changes form 12/12/2014