updated week2 sol2 of Jonatan Folder