Committing to complete issue 71