bit o re-organizing