some general shuffling around -