Fixed issues from week 2