incude collapseone in calculation