Some more improvements in the power routing. Final version?