replaced manual list of properties with loop through most properties