Refactoring: changed 'packet' to  'message'