my final commit, before presentation