*8477* Move sword to v2