Again some changes in the loading part
Merge remote-tracking branch 'origin_dii/master'