reverting from tuple to dictionary--- much faster now