Fixed colisions!