Dev 1.1 Second Pull Request

I think L61 ~ L63 is not needed anymore since you fetched the data for the comment in L52