removed default domain, changed again argument name, refactoring message