Same as previous commit but w/ Velocity.