After New Comment Solution, lunch and custom fixes