Added comments and started renumbering check