updated issue 6