Change all true/false to YES/NO for #154