Commented out code in order to make the gem stable while I am not troubleshooting status