message controller changes