Altered Wait for STop

DOPE