Fixed collision detection + optimised for android