added some shit and deleted some shit