Update #2

It's now easier to maintenance the code