~ Add some tweaks