modified activity and message structure