Unit collision improved