Fixing promises to be better