Change order of calls