rebuilt with @HydraJax added!