Addressed second round comments