Updated to new style comprehensions