updates, rearrangements, additions