Comments from master should be put back in.