Rearrange, changes, stabalization, updates