Adds comment ; Fixed thread issue