change order of methods