add final changes

add final changes