removed all the first load logic and made it use already available methods.