change the remove-power implementation