Upgraded groovy