Added some fine-tuning