Updated collision detection - again