finish integrating new file for issue #10