Motor demo changes