Updated UC3 and UC6

UC3 and UC6 are updated as discussed in #70