updated issue 2-2