Some modifications in the code.