Also reordered the sections to put the logs at the end.