moved splitting out of mapping