Just reorder things