Improve loading logic futher