Temporarily reverted changes to check if it originally worked