Messy changes done in vendor.js