First steps for standard-compliant version