Replace Aync with Promises/A+