Felt like it needed rearrangement