added option for preserving comments