all changes done by max and pushed by Jonas :D