updated issue 9