Changed order of focus