changed order of methods