Changes to make it work in the browser too
Uncomment lines to move new file into place