Be consistent
Add and use optional flag.
Logging
Logging