Improved definition, resolved setting/property confusion