getting closer, reorged again