updates from Adrian's suggestions