new keys and get_mps fix