moved loading to proper library