preparing for power update
fixed merge