added messaging
modified triggers