improved parsing of message 1