*Old versions of property 3 removed
*Unused private methods removed
*Some variable names fixed in property 3