Sync with XDite's answer for week2 class