Collision

Further improvments