Addressed second round comments
Addressed last review comments