final changes for ucp