Add discipline field for ease of programming.
Minor adjustments