last of mapping changes