Reworked power system logic