Update Main code of evaluation