added yes/no condition