[:wip] temp update - need custom promise