final changings added