Added optional tag instead of removing lines.