ironed out optionWaiting logic