Improved performance of RightComment