REBASE progress
moved and reordered