V0.9.5 Fine tuning