amyshen12 update to xiaoshen12