Updated start and stop method