Today
merge from deep_sea_repel -> naval_update