modified to work with ember-cli