Reshuffled more code.