trying to improve the efficiency of the loading and other minor changes