Some modifications