Added digits 5, 7, and 8 support to wizard.