Some modifications done