changes to dispatcher