fixing loading changes