Incorporated the changes made by Arben for UPN history