more changes to incoming  message controller