big dictionary and some changes