adding/fixing up week 8