updated damon's mapping