changed the collision code around (not working proberly yet)