tweaks for UCP