Update the maps and targets, second attempt