Re-ordering to make more interactive