adding issue 7