Addressing part of second round review comments
Addressing next set of second round review comments