speed improved, changed helpers.js