changes on token comments