update to issue 9