Merged v2.1 with original 2.0 Plus (my 2.2)