Some other modifications