More loading updates, not 100% yet