Made Changes to incorporate weeks 2 and 3