finished, add comments on live version