fixed the xs_setup steps