Bunch of changes!
forgot sql