changed dict and added some rules