Adding comments stuff back in.