with final last revisions for new namespace