Moving a little code around.