Fixed the promise-style and added missing updates