2.0.2 adds remainder of keys