Changes for new message format - NOT WORKING