change unpack to not look for message object