Adding Rishir's dictionary stuff