started adapting messages to new system