Week 3 Done. + modified. v2. (reordered)