re-ordering things so they seem more stable ...