modified file for issue #3