Reordering / comments added