Converted all ranges to 1 property