Modified Some Issue