improved parsing of message 2