Worked on moving to newer Groovy