changed lists to maps