Moved last time calculation into graph
Even more list comprehensions