fix no, and add yes