Changed true/false to YES/NO for consistency