Improve general stability