finished and tested potential and map potential
Former-commit-id: eecb029dc0b7145744ee924b558720ee779e8760