removed the extra stop code