UIM update (mostly working!)