Added more motion states for each of the basic motions.