Update UCP: second part
Update UCP: third part