explicit copy correct version
improve yard handling so we can automatic generate it