Changed order of methods