Important stabilization but still work in progress...