rework dispatch table