Make start and stop better