Updated evaluation, started on evaluation metrics