Improve overall stability