switched out vectors for maps