some updates of mapping = yadr