Mproved collsions, still needs some fixes