week2 continued
week2 & 3 merged