Some modifications and additions
Some other modifications and additions