Week 6 and fixed WTF assignment