Remove OS conditional. Set wait column as optional. Add comment.