Began integrating issue #5