improved api stop / start