Re-ordered some work