WIP

- adapt / add tests
- simplify notation