Adjust ordering of methods