replaced Promise with oldPromise