Change order of code 2