Use new comprehensions