some changes and a dictionary