Some modifications !