We have some code rearrangement