Damping factor logic improvements