Was copied from the original, but sure... dict comprehension coming up