Goto and stop now working properly