Working on geokit integration
Fixed geokit usage