Some modifications more