Added collision check + other stuff.