Re-arranging
Pushing updates for June 10th