Issue 3 reorder