Addressed CR comments