Update #1 v2.2

New code design!