removed some shit, added some shit