TODO retain comments