fix collapse factor
include % mapping and % good