merge majdal/modex into my own copy