lines 10 & 11 also need updating to reflect that both properties and values are counted.