Tweak with a few things