A touch more evaluation added