complete step 5
update to reset function
merge from github