HW05_V2.0 Need to change every thing into Macro