Add in stubholders and more personal comments