Fixed bugs in weeks 16 & 17