Just moving some code around.