Reorder things a little bit