A Few tweaks