Added a temp buffer to check for the disallowed words.
Fixed merge issues.