messages restructured