More tuning added