Groomer update

NOT READY FOR MERGE
ii is not defined here.