Improving CUP file