removed some old shit and added some new