some tweaks in response to your email