Another code rearrangement