Yep, I switched over to the Shoup kits at least 5 years ago, maybe longer, and it's worth it. Not that expensive either.