Changed to use <AIMOVEMENTCOMPONENT> for temporary fix