Addressed last CR issue