Some modifications in script