Make it work for mass collection units too