Merge with Thomas + fixed Gmap problems