tweaks after convo with Kevin