Continue working on loading flow