Stable version with working overlays and map