Code up to date with video #78.