change to standalone comments