Fixed Load Time and ATR bug