inputs included by aria minaei, merged