renamed and deleted some things