957070 - update based on patch feedback
957070 - update based on patch feedback