Merge original with moded version!