Some finetunning