Adapt selection and evaluation

Last updated