Some Changes are made!