Some modifications in the existing source