major modification ! ucf was off