Some more work on the powersystem