Updated to changes in basis.js