changed show calculations
merge with brian's latest
merge brian's latest