Further work on updated message handling .