Changes done, as suggested