unneeded stuff and changed more to a stopandwait form