Work in progress fixing message sequence generation