Some rearrange to the code.