Updated the order of the columns to be more logical (in my opinion :))