Updates to issue 58