adding Rishis conditions-builder change for multiple