renamed OnStop in Stop