New: expanded-form