small changes to evaluation