working on removing UM/UF - unsuccessfully