changed loading and stuff