further changes to the dispatcher