Changed spaces with tabs, changed one comment and set the collision algorithm to the previous one