#8: A recap and some changes