Improvements by antimon51