Removed and added some shit