modified message class