more changes on makes duplicate collections issue