Add back logic to check for special things to comment