tweaks for Martin demo