Tech Debt: Updated loader.js