motion upgrade for motion complete querying and a simulator fix