I tried that. In some places it worked great. In others it doesn't work well because of how we combine variables into the SQL. To be honest, I had a macro that helped a lot with this part.