Working on another GEO
merged josh fixes