update s04 and s05; add s06