(2nd attempt) Upgraded to hydro (also should work with groovy)