Added collision detection + new build