improvements to dispatch