diff --git a/pre-edited-cs/data/Stage/River.pxe b/pre-edited-cs/data/Stage/River.pxe
index 1ccf3cc..2c1333f 100644
Binary files a/pre-edited-cs/data/Stage/River.pxe and b/pre-edited-cs/data/Stage/River.pxe differ
diff --git a/pre-edited-cs/data/Stage/River.tsc b/pre-edited-cs/data/Stage/River.tsc
index 041728b..926b676 100644
--- a/pre-edited-cs/data/Stage/River.tsc
+++ b/pre-edited-cs/data/Stage/River.tsc
@@ -1 +1 @@
-=:S``i`=:l}~qls}…``chlƒƒƒ`d``lvqy````lv|z`hcfj``iflu~t=:S``ia=:l}~qls}…``chlƒƒƒ`d``lvqy```alv|z`hcfj``iflu~t=:S``ib=:l}~qls}…``chlƒƒƒ`d``lvqy```blv|z`hcfj``iflu~t=:S``ic=:l}~qls}…``chlƒƒƒ`d``lvqy```clv|z`hcfj``iflu~t=:S``id=:l}~qls}…``chlƒƒƒ`d``lvqy```dlv|z`hcfj``iflu~t=:S``ie=:ls}…``chlvqy````lu~t=:S``if=:lv|zfa`ij``iglv|zadddj````ls}€`adij``aij``cclu~t=:S``ig=:lv|za`dbj``ihlu~t=:S``ih=:lt~€`hcflu~t=:S`a``=:l{u‰lvq0``alsƒƒl„‚q``dgj``iaj```hj```i=:S`aa`=:l{u‰lv~`b``j``afl‡qy``a`lvq````lv}``aflv|z`he`j`aaa=:lv|[`he`l}‰t````l„‚q``caj``ibj``c`j```h=:S`aaa=:l{u‰lsƒƒl„‚q``aej``icj``adj```a=:S`aaf=:S`ab`=:l{u‰lq~€`ab`j````j```blƒ…``aa=:lvq```dlsƒƒl„‚q``gcj``idj```fj```i=:S`b``=:S`bb`=:l{u‰lt~€`bb`=:lv|zadddj````=:lv|z`hcfj`bbalu~t=:S`bba=:l€‚yl‡qy````l{u‰lv|[`hea=:l‡qƒl‡qy``e`l€‚yl}ƒws¥¢œ©W£Pœ™–•P–¥ž“¤™Ÿž£P˜‘¦•=:“•‘£•”^^^l~tlu~t
\ No newline at end of file
+IF_llulIFx‰Š}x‰‘llotx���lpllx‚}…llllx‚ˆ†ltorvllurx�Š€IF_llumIFx‰Š}x‰‘llotx���lpllx‚}…lllmx‚ˆ†ltorvllurx�Š€IF_llunIFx‰Š}x‰‘llotx���lpllx‚}…lllnx‚ˆ†ltorvllurx�Š€IF_lluoIFx‰Š}x‰‘llotx���lpllx‚}…lllox‚ˆ†ltorvllurx�Š€IF_llupIFx‰Š}x‰‘llotx���lpllx‚}…lllpx‚ˆ†ltorvllurx�Š€IF_lluqIFx‰‘llotx‚}…llllx�Š€IF_llurIFx‚ˆ†rmluvllusx‚ˆ†mpppvllllx‰Œlmpuvllmuvlloox�Š€IF_llusIFx‚ˆ†mlpnvllutx�Š€IF_llutIFx€ŠŒltorx�Š€IF_lmllIFx‡�•x‚}‹lllm<��x�Ž}llpsvllumvllltvllluIF_lmmlIFx‡�•x‚‹Šlnllvllmrx“}…llmlx‚}‹llllx‚‹‰llmrx‚ˆ†ltqlvlmmmIFx‚ˆgltqlx‰•€llllx�Ž}llomvllunvllolvllltIF_lmmmIFx‚ˆiltorx‡�•x��x�Ž}llmqvlluovllmpvlllmIF_lmmrIF_lmnlIFx‡�•x}ŠŒlmnlvllllvlllnx�‹‘llmmIFx‚}‹lllpx��x�Ž}llsovllupvlllrvllluIF_lnllIF_lnnlIFx‡�•x€ŠŒlnnlIFx‚ˆ†mpppvllllIFx‚ˆ†ltorvlnnmx�Š€IF_lnnmIFxŒŽ…x“}…llllx‡�•x‚ˆgltqmIFx“}�x“}…llqlxŒŽ…x‰�ƒ±®¨µc¯\¨¥¢¡\¢±ªŸ°¥«ª¯\¤�²¡IFŸ¡�¯¡ jjjxŠ‹€x�Š€
\ No newline at end of file
diff --git a/pre-edited-cs/data/Stage/ScriptSource/River.txt b/pre-edited-cs/data/Stage/ScriptSource/River.txt
index f732359..c730153 100644
--- a/pre-edited-cs/data/Stage/ScriptSource/River.txt
+++ b/pre-edited-cs/data/Stage/ScriptSource/River.txt
@@ -27,7 +27,7 @@
 <KEY<FON0200:0016<WAI0010<FAO0000<FOM0016<FLJ0850:0111
 <FL+0850<MYD0000<TRA0031:0092:0030:0008
 #0111
-<KEY<CSS<TRA0015:0093:0014:0001
+<FL-0836<KEY<CSS<TRA0015:0093:0014:0001
 
 #0116
 
diff --git a/src/randomizer.lua b/src/randomizer.lua
index f8083e4..6712071 100644
--- a/src/randomizer.lua
+++ b/src/randomizer.lua
@@ -202,6 +202,9 @@ function C:_shuffleItems(tscFiles)
   -- next fill hell chests, which cannot have mandatory items
   self:_fastFillItems(optional, shuffle(self.worldGraph:getHellSpots()))
 
+  -- add map system AFTER filling hell chests so that it gets placed somewhere accessible in every objective
+  optional = _.append(optional, self.itemDeck:getByKey("mapSystem"))
+
   -- place mandatory items with assume fill
   self:_fillItems(mandatory, shuffle(_.reverse(self.worldGraph:getEmptyLocations())))