Did more collision detection...
merged