updated for new velocity / pan types