update s2 and s5 and world arranagement