added groovy stuff