removed context and observer and added scope class