Reverted to the situation with two dictionaries