Revert "presentation"

This reverts commit 045e1f1907d6c0dfcea84a36cf5267f69b728aed.
Revert "Revert "presentation""

This reverts commit 15a169dfba16e615b6dfd0a3f8356cda87aac596.
refactoring