note move to 2.1 in master
more fully support diet mode
tests passing 2.1