Some Changes Done.