added scope isolation