Pull request for modified functionality

Yay modification