adding list checks, too