modified with new UCF