Change order of build