changed maps to lists