refactor complite
add setting realisation
Merge branch 'feature/logicrefactor' into develop