Switching to new excerpt system