merged code von max