Some modifications made