add offset and change xo cmd
fix conflict