Updated with Msg Ui part