improved parsing of message 3