Change order of methods