Updated to run on groovy