minor amendments
Merge branch 'origin/parametric'