Added geo stuff