tabula rasa after some minor changes
cleaning up again,