after rewiring (and some documenting)