some more finetuning