added null state for comments