V29: finish theory part
V29: Correct some issues with the evaluation