Doing some tweaks