refactor + new GeoLift jar