Oops... Added updated controller for messages