final #swchiedu commit