completed work on #41