adding tuning code / build fix