Level 1.7

Merging patch, double collisions.