Updated to promises vesrion