Worked on #72.