Removed promiseDone, just using then/catch