Some other modifications..