Ready for 1.8.5.7: Total rewrite