integrated finetuning from @ratrun for #190