Refactored for local source instead of CDN