more updates and re-ordering