continued generic mapping code