Changes done as asked