updated to uses message