Some modifications...