Yesterday
add back relief mapping stuff that was accidentally reverted in prior merges