123 - PV - Standardise properties

Revise as comments.