Handle keywords first
2 files changed