More loading script changes