My carb air box shaft and bushings need attention (PA-18-150). I acquired a non TSO kit that says it will fit Pipers J-3 through PA-22. It looks like it will work (the shaft is a little short) but, is there a better option? Is there a TSOd Kit out there? Univair didn't have one.