Moving towards a more streamlined evaluation system