updated issue 2