Groomer update

Ready for merging.