Latest updates for collision, new classes