Addressed last comments