changed to dict comprehensions