Fine tuning 0.9.1