move the code fetch in