revert due to trying to be "smart of properties"....