Improve Ember Time