Adapt comments