Some Modification Done