some changes for Andrew
put back as yes and no