add changes from last codereview to repo