removed crap and made collision better