Apply comments from tjc