updates for code consistency
update the loading system