Some Changes done