Mod2

Here's week two!
Thx for the optimization tip. Fixed.