removed the UCP stuff to simplify the code