add remove and count measure fixed