Added wait for loading in data first time