Addressed first set of issues