Fixed and made uniform all discipline requirements