reorder and updates to email etc