changed loading methods