changes from lessons 3 & 4