modified dispatcher and messages