Updated to match index.js