Some fine-tuning before handing in