use RSVP instead of thenjs
rewrite