changes applied- working build