move some stuff around for clarity, for reals