MOTD improvement again