changed map to vector