Final updates per Victor feedback.