Added incoming message via timer logic and refactor