improve the template after some tests in the engine