Worked on efficiency, changed name in dictionary