some edits
add some code