Beefs up movement planning