Upgraded transitions to use velocity