Improvement From

Hexacid Assert