ms viz code and figures
merge viz conflict