Few changes to perform a new evaluation