Added code from Days 6 & 7