Switched to generic CDU instead of old version