Added FailSafes, and Optimization.