My final changes with one question/note within