Improved autosolve macros