changed loading order