Added more yes/no