Added comments and parametric capabilities