upadted for messages and notification controller

e