adjusted latest {{ mapping