more loading changes