made adjustments and added dictionary