User feedback addressed

User feedback addressed
Incremental commit

Incremental commit