added shortname and return code to return message