some changes. Added VelocityDescriptor