modified file for issue #2