fix refactoring + add tri dev