Please look at comments in code for changes that have to be reviewed. The comments are marked as TODO.