Wip/new gesta

* adjustments for new gesta.