reordered to fit the things to be ordered with the schema diagram