re-organizing some more