Updated UC6 

Changes in UC6 according to #66