changed evaluation and added log