more loading changes...