improve remote resolve stage