Add Stop logic and starting from scratch