diff --git a/Content/Blueprints/Data/Flatinfo1.uasset b/Content/Blueprints/Data/Flatinfo1.uasset
index 193af6fc..ae2d0cd2 100644
Binary files a/Content/Blueprints/Data/Flatinfo1.uasset and b/Content/Blueprints/Data/Flatinfo1.uasset differ
diff --git a/Content/Blueprints/Data/flatData.uasset b/Content/Blueprints/Data/flatData.uasset
index 014f2b26..31dcfa6f 100644
Binary files a/Content/Blueprints/Data/flatData.uasset and b/Content/Blueprints/Data/flatData.uasset differ
diff --git a/Content/Blueprints/Data/macroFUncs.uasset b/Content/Blueprints/Data/macroFUncs.uasset
new file mode 100644
index 00000000..1ef2f570
Binary files /dev/null and b/Content/Blueprints/Data/macroFUncs.uasset differ
diff --git a/Content/Blueprints/Player/CM.uasset b/Content/Blueprints/Player/CM.uasset
index e3c6aa59..5d8d17e7 100644
Binary files a/Content/Blueprints/Player/CM.uasset and b/Content/Blueprints/Player/CM.uasset differ
diff --git a/Content/Blueprints/Player/GI.uasset b/Content/Blueprints/Player/GI.uasset
index 313912b6..d68c9dbc 100644
Binary files a/Content/Blueprints/Player/GI.uasset and b/Content/Blueprints/Player/GI.uasset differ
diff --git a/Content/Blueprints/Player/GameplayFunctions.uasset b/Content/Blueprints/Player/GameplayFunctions.uasset
index 404b4cfc..0b958962 100644
Binary files a/Content/Blueprints/Player/GameplayFunctions.uasset and b/Content/Blueprints/Player/GameplayFunctions.uasset differ
diff --git a/Content/Blueprints/Player/MyPawn.uasset b/Content/Blueprints/Player/MyPawn.uasset
index d1db9d96..9399a887 100644
Binary files a/Content/Blueprints/Player/MyPawn.uasset and b/Content/Blueprints/Player/MyPawn.uasset differ
diff --git a/Content/Blueprints/Player/getFunctions.uasset b/Content/Blueprints/Player/getFunctions.uasset
index 9c0e3429..4b8522ee 100644
Binary files a/Content/Blueprints/Player/getFunctions.uasset and b/Content/Blueprints/Player/getFunctions.uasset differ
diff --git a/Content/Blueprints/UI/Actors/FlatPoint.uasset b/Content/Blueprints/UI/Actors/FlatPoint.uasset
index a72277a5..5947e267 100644
Binary files a/Content/Blueprints/UI/Actors/FlatPoint.uasset and b/Content/Blueprints/UI/Actors/FlatPoint.uasset differ
diff --git a/Content/Blueprints/UI/Actors/flatCAP.uasset b/Content/Blueprints/UI/Actors/flatCAP.uasset
index 0d2a9567..f8fec1ff 100644
Binary files a/Content/Blueprints/UI/Actors/flatCAP.uasset and b/Content/Blueprints/UI/Actors/flatCAP.uasset differ
diff --git a/Content/Blueprints/UI/Actors/parkingPoint.uasset b/Content/Blueprints/UI/Actors/parkingPoint.uasset
index 4a92609f..6439b172 100644
Binary files a/Content/Blueprints/UI/Actors/parkingPoint.uasset and b/Content/Blueprints/UI/Actors/parkingPoint.uasset differ
diff --git a/Content/Blueprints/UI/Widgets/KPWidget.uasset b/Content/Blueprints/UI/Widgets/KPWidget.uasset
index 95103418..4b94593e 100644
Binary files a/Content/Blueprints/UI/Widgets/KPWidget.uasset and b/Content/Blueprints/UI/Widgets/KPWidget.uasset differ
diff --git a/Content/Blueprints/UI/Widgets/Menu/CardForBooking.uasset b/Content/Blueprints/UI/Widgets/Menu/CardForBooking.uasset
index cb2cdec0..ddc14651 100644
Binary files a/Content/Blueprints/UI/Widgets/Menu/CardForBooking.uasset and b/Content/Blueprints/UI/Widgets/Menu/CardForBooking.uasset differ
diff --git a/Content/Blueprints/UI/Widgets/Menu/EndSessionCard.uasset b/Content/Blueprints/UI/Widgets/Menu/EndSessionCard.uasset
index 1437fe7d..3e3cb3f9 100644
Binary files a/Content/Blueprints/UI/Widgets/Menu/EndSessionCard.uasset and b/Content/Blueprints/UI/Widgets/Menu/EndSessionCard.uasset differ
diff --git a/Content/Blueprints/UI/Widgets/Menu/FavoriteCard.uasset b/Content/Blueprints/UI/Widgets/Menu/FavoriteCard.uasset
index 9aa487fa..1f323ba7 100644
Binary files a/Content/Blueprints/UI/Widgets/Menu/FavoriteCard.uasset and b/Content/Blueprints/UI/Widgets/Menu/FavoriteCard.uasset differ
diff --git a/Content/Blueprints/UI/Widgets/Menu/Layout.uasset b/Content/Blueprints/UI/Widgets/Menu/Layout.uasset
index b348ca60..df4a70a7 100644
Binary files a/Content/Blueprints/UI/Widgets/Menu/Layout.uasset and b/Content/Blueprints/UI/Widgets/Menu/Layout.uasset differ
diff --git a/Content/Blueprints/UI/Widgets/Search/BigSearchCard.uasset b/Content/Blueprints/UI/Widgets/Search/BigSearchCard.uasset
index a67dadc2..26c927a4 100644
Binary files a/Content/Blueprints/UI/Widgets/Search/BigSearchCard.uasset and b/Content/Blueprints/UI/Widgets/Search/BigSearchCard.uasset differ
diff --git a/Content/Blueprints/UI/Widgets/Search/Search.uasset b/Content/Blueprints/UI/Widgets/Search/Search.uasset
index 5d614fb7..1f22afa5 100644
Binary files a/Content/Blueprints/UI/Widgets/Search/Search.uasset and b/Content/Blueprints/UI/Widgets/Search/Search.uasset differ
diff --git a/Content/Blueprints/UI/Widgets/Search/SmallSearchCard.uasset b/Content/Blueprints/UI/Widgets/Search/SmallSearchCard.uasset
index f1010722..ccafc921 100644
Binary files a/Content/Blueprints/UI/Widgets/Search/SmallSearchCard.uasset and b/Content/Blueprints/UI/Widgets/Search/SmallSearchCard.uasset differ
diff --git a/Content/Maps/Interior/GP1/Points/F02/GP1_S01_F02_Navi.umap b/Content/Maps/Interior/GP1/Points/F02/GP1_S01_F02_Navi.umap
index fb765197..1b5123c8 100644
Binary files a/Content/Maps/Interior/GP1/Points/F02/GP1_S01_F02_Navi.umap and b/Content/Maps/Interior/GP1/Points/F02/GP1_S01_F02_Navi.umap differ
diff --git a/Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S01_F03-05_F08_Navi.umap b/Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S01_F03-05_F08_Navi.umap
new file mode 100644
index 00000000..805bbb8a
Binary files /dev/null and b/Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S01_F03-05_F08_Navi.umap differ
diff --git a/Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S01_F03-F05_F08_Navi.umap b/Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S01_F03-F05_F08_Navi.umap
deleted file mode 100644
index 16a74390..00000000
Binary files a/Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S01_F03-F05_F08_Navi.umap and /dev/null differ
diff --git a/Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S02_F03-F05_F08_Navi.umap b/Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S02_F03-05_F08_Navi.umap
similarity index 78%
rename from Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S02_F03-F05_F08_Navi.umap
rename to Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S02_F03-05_F08_Navi.umap
index 7fe15a5c..82e14179 100644
Binary files a/Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S02_F03-F05_F08_Navi.umap and b/Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S02_F03-05_F08_Navi.umap differ
diff --git a/Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S03_F03-F05_F08_Navi.umap b/Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S03_F03-05_F08_Navi.umap
similarity index 78%
rename from Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S03_F03-F05_F08_Navi.umap
rename to Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S03_F03-05_F08_Navi.umap
index 833aaeb0..1d54f689 100644
Binary files a/Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S03_F03-F05_F08_Navi.umap and b/Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S03_F03-05_F08_Navi.umap differ
diff --git a/Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S04_F03-F05_F08_Navi.umap b/Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S04_F03-05_F08_Navi.umap
similarity index 78%
rename from Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S04_F03-F05_F08_Navi.umap
rename to Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S04_F03-05_F08_Navi.umap
index e6ff44ce..3017aed6 100644
Binary files a/Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S04_F03-F05_F08_Navi.umap and b/Content/Maps/Interior/GP1/Points/F03-F05+F08/GP1_S04_F03-05_F08_Navi.umap differ
diff --git a/Content/Maps/Interior/GP1/Points/F06-07/GP1_S01_F06-07_Navi.umap b/Content/Maps/Interior/GP1/Points/F06-07/GP1_S01_F06-07_Navi.umap
new file mode 100644
index 00000000..efc300ad
Binary files /dev/null and b/Content/Maps/Interior/GP1/Points/F06-07/GP1_S01_F06-07_Navi.umap differ
diff --git a/Content/Maps/Interior/GP1/Points/F06-07/GP1_S01_F06-F07_Navi.umap b/Content/Maps/Interior/GP1/Points/F06-07/GP1_S01_F06-F07_Navi.umap
deleted file mode 100644
index 2d7c1697..00000000
Binary files a/Content/Maps/Interior/GP1/Points/F06-07/GP1_S01_F06-F07_Navi.umap and /dev/null differ
diff --git a/Content/Maps/Interior/GP1/Points/F06-07/GP1_S02_F06-F07_Navi.umap b/Content/Maps/Interior/GP1/Points/F06-07/GP1_S02_F06-07_Navi.umap
similarity index 78%
rename from Content/Maps/Interior/GP1/Points/F06-07/GP1_S02_F06-F07_Navi.umap
rename to Content/Maps/Interior/GP1/Points/F06-07/GP1_S02_F06-07_Navi.umap
index 83b2b4de..ae046eb6 100644
Binary files a/Content/Maps/Interior/GP1/Points/F06-07/GP1_S02_F06-F07_Navi.umap and b/Content/Maps/Interior/GP1/Points/F06-07/GP1_S02_F06-07_Navi.umap differ
diff --git a/Content/Maps/Interior/GP1/Points/F06-07/GP1_S03_F06-F07_Navi.umap b/Content/Maps/Interior/GP1/Points/F06-07/GP1_S03_F06-07_Navi.umap
similarity index 78%
rename from Content/Maps/Interior/GP1/Points/F06-07/GP1_S03_F06-F07_Navi.umap
rename to Content/Maps/Interior/GP1/Points/F06-07/GP1_S03_F06-07_Navi.umap
index 5d222b2d..9fe54fbb 100644
Binary files a/Content/Maps/Interior/GP1/Points/F06-07/GP1_S03_F06-F07_Navi.umap and b/Content/Maps/Interior/GP1/Points/F06-07/GP1_S03_F06-07_Navi.umap differ
diff --git a/Content/Maps/Interior/GP1/Points/F06-07/GP1_S04_F06-F07_Navi.umap b/Content/Maps/Interior/GP1/Points/F06-07/GP1_S04_F06-07_Navi.umap
similarity index 76%
rename from Content/Maps/Interior/GP1/Points/F06-07/GP1_S04_F06-F07_Navi.umap
rename to Content/Maps/Interior/GP1/Points/F06-07/GP1_S04_F06-07_Navi.umap
index 82a22e3b..9486de5c 100644
Binary files a/Content/Maps/Interior/GP1/Points/F06-07/GP1_S04_F06-F07_Navi.umap and b/Content/Maps/Interior/GP1/Points/F06-07/GP1_S04_F06-07_Navi.umap differ
diff --git a/Content/Maps/Interior/GP1/Points/F09/GP1_S01_F09_Navi.umap b/Content/Maps/Interior/GP1/Points/F09/GP1_S01_F09_Navi.umap
index 83a1ba2f..d37139dd 100644
Binary files a/Content/Maps/Interior/GP1/Points/F09/GP1_S01_F09_Navi.umap and b/Content/Maps/Interior/GP1/Points/F09/GP1_S01_F09_Navi.umap differ
diff --git a/Content/Maps/NewWorld.umap b/Content/Maps/NewWorld.umap
index 86b02429..aa6e97bf 100644
Binary files a/Content/Maps/NewWorld.umap and b/Content/Maps/NewWorld.umap differ
diff --git a/Content/Materials/Interior/MI_Floor_Parquet_AI.uasset b/Content/Materials/Interior/MI_Floor_Parquet_AI.uasset
index 2df20aa0..4b703f5f 100644
Binary files a/Content/Materials/Interior/MI_Floor_Parquet_AI.uasset and b/Content/Materials/Interior/MI_Floor_Parquet_AI.uasset differ