Reordered definitions