Some modification again