working on issue 53