changes done

More changes in Code