reorder to make things line up better