Made a couple slight tweaks for Vivek