Added start and stop routines