adding in changes for the latest github pull