caly projekt
some refactorisation
some refactorisation