add proper handling of no and non yes responses