First step in converting to async to reduce loading times