Changed more away from the dict.