Fixed Evaluation controller. Lost a lost of stuff though