some rearrangement of Potential class