GENEL Warning Improvements by Xon