changed to proper loading method