trying to fix new architecture (again)