Took more Christian's notes into account