#622 new course page logic