Code up to date with video #57.