reorganized a bit.