Added stuff, deleted some