#64. Updated the UC2 and UC3