Some modifications
Some more