Add code to allow testing issue 4