Added solution evaluation