Quick refactor
We need to process all messages to stay in sync