updates and rearrangements