replaced list-comprehensions by tuples