some renaming, still can't calc. power properly