Major Update for Commenting and Table View Performance