fix training & Performance problems fast...