Some more finetuning...