Debugged and finished Dictionary