v2.0 with cleaner UI