separate-out the non-resetty stuff