dispatcher improvements