Added some more tweak parameters for easier testing