Reorder

See #164