Updating with changes from demo/backbone