Adapted to most recent UF menu API