newchange 2 branch that will go into master
removed some lines