preps for v2.1