Added goals evaluation