updated some codes
updated some codes
merge