almost complete update for next semester