Adding checks for %%v%%