reconciling with jeff-norman branch