Major update for 2.1