moved loading to app start