check point-first implementation of VelocitHandler