Adapt in order to take in account comments