removed crap and added more