- reworked part of the application to work with remote messages