Improved the Velocity example