Modify order of code