More refinements to Orbat