supports geo stamp and better state handling