- refactor to check messages from both enc systems