Update UC6

As discussed in #66 and #44