Structure tweak, and portal upon arriving is simpeler