added optimizer, vel_shift