Eliminated ToList() to improve performance