Added matrix evaluation