final config
modified for GP presentation
Merge branch 'feature/final' into develop