updated master to not use dictionary comprehension