complete work on #72