some reorganisations - it is hopefully still working