modified file for issue #1