Fixed Week2 issues, Starting week3