start working on issue 157