Also I found a 6.0 original jib to work better than the NA jib on windward leeward courses. A new rig Tornado jib (self tacking) should work and since this is an Olympic run year the used ones should be fairly cheap