Some simplifications
Further experiments
Some refactoring