Work in progress for type 5 messages