changes done as suggested by Amit and GN sir