Fine tuning (8/29)

Fine tuning