finished the v2.0 of this app