Updated map to latest bay, fixed conflicts and re-added Hyperion changes.