reworked with GeoPay class