Reverted some changes to try to troubleshoot errors