move function to correct place
changes
lines and columns aren't necessary
merge master