added message forwarding code