updates as per Rod's suggestions