merged with ipa320, updates for groovy