fixed logical error with collision & integrate