Modified Some Code