reworking comments