Changes in method name and other minor changes