added untested ucs fi support