Changed lots of things

Quadrilitization does not work. Have to think about it carefully.
Looking an other approach.