Final, final updates for JOUR 7800 class