Added stop before start