Modified the numbering to be consistent. Issue #3.