Small rearrange for testing