Refactoring + Infer1x1 draft