moving lots of extra components into clustersense_extra