updating to reflect latest updates to Mote's code