More work on dispatching