revise for kirby motion