WV-1178 More consistent pick movement over years