Added stuff, changed stuff around