reorganized things a bit.