Improve reliability and safety