tweaks for Jonathan to look at