trying to fix the new namespace inclusions