Added comments from Matthew